Autogenerated HTML docs for v1.7.10-227-gd1ca7
diff --git a/git-config.html b/git-config.html index 5cbd53f..4028927 100644 --- a/git-config.html +++ b/git-config.html
@@ -1205,8 +1205,41 @@ </dt> <dd> <p> - Advice shown when <a href="git-push.html">git-push(1)</a> refuses - non-fast-forward refs. + Set this variable to <em>false</em> if you want to disable + <em>pushNonFFCurrent</em>, <em>pushNonFFDefault</em>, and + <em>pushNonFFMatching</em> simultaneously. +</p> +</dd> +<dt class="hdlist1"> +pushNonFFCurrent +</dt> +<dd> +<p> + Advice shown when <a href="git-push.html">git-push(1)</a> fails due to a + non-fast-forward update to the current branch. +</p> +</dd> +<dt class="hdlist1"> +pushNonFFDefault +</dt> +<dd> +<p> + Advice to set <em>push.default</em> to <em>upstream</em> or <em>current</em> + when you ran <a href="git-push.html">git-push(1)</a> and pushed <em>matching + refs</em> by default (i.e. you did not provide an explicit + refspec, and no <em>push.default</em> configuration was set) + and it resulted in a non-fast-forward error. +</p> +</dd> +<dt class="hdlist1"> +pushNonFFMatching +</dt> +<dd> +<p> + Advice shown when you ran <a href="git-push.html">git-push(1)</a> and pushed + <em>matching refs</em> explicitly (i.e. you used <em>:</em>, or + specified a refspec that isn’t your current branch) and + it resulted in a non-fast-forward error. </p> </dd> <dt class="hdlist1"> @@ -4867,7 +4900,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2012-03-02 11:52:01 PDT +Last updated 2012-04-20 12:42:45 PDT </div> </div> </body>
